action muxer: Don't activate disabled actions
authorMatthias Clasen <mclasen@redhat.com>
Sun, 23 Jun 2019 01:19:19 +0000 (21:19 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Sun, 23 Jun 2019 01:39:26 +0000 (01:39 +0000)
We really shouldn't.

gtk/gtkactionmuxer.c

index b752ea08e7c17ff5948106e0febc109d153e6156..23c4f56a5a67b948503112a3817cb2e436e778a5 100644 (file)
@@ -648,10 +648,13 @@ gtk_action_muxer_activate_action (GActionGroup *action_group,
           GtkWidgetAction *action = g_ptr_array_index (muxer->widget_actions, i);
           if (strcmp (action->name, action_name) == 0)
             {
-              if (action->activate)
-                action->activate (muxer->widget, action->name, parameter);
-              else if (action->pspec)
-                prop_action_activate (muxer->widget, action, parameter);
+              if (muxer->widget_actions_enabled[i])
+                {
+                  if (action->activate)
+                    action->activate (muxer->widget, action->name, parameter);
+                  else if (action->pspec)
+                    prop_action_activate (muxer->widget, action, parameter);
+                }
 
               return;
             }